Merge pull request #4 from ipri2013/master

New one
Bug fixed.
Merge pull request #38 from juree/master

Bug fixed.