Fix issue #19

@webwarrior-ws : could you check this fix your issue?
![selfie-0](http://i.imgur.com/6JJiBBX.png)