Fixed bug
Merge pull request #16 from lukida/master

Fixed bug #2