fix for issue 379
Merge branch 'develop' of github.com:yinqiwen/gsnova into develop