Fixed poor handling
Merge pull request #5 from antoneri/master

Fixed poor handling