reviewed and fixed
Merge pull request #14 from zsolt-fulop/master

reviewed and fixed