453a72b merging changes from nb into master

1 file Authored by nb 10 years ago, Committed by immanetize 10 years ago,
    merging changes from nb into master
    
        
file modified
+36 -37