Fixed bug #12
Merge pull request #23 from lukida/master

Fixed bug #12