Fixed bug #8
Merge pull request #17 from lukida/master

Fixed bug #8