nota-782 almost fixed
Merge pull request #29 from ybk/master

nota-782 almost fixed