fix #111;
improvements
improvements
Merge pull request #120 from ihptru/master

improvements