closes #788
Merge pull request #796 from neo22s/master

closes #788