Fixed a critical bug
Merge pull request #4 from armaa/master

Fixed a critical bug