Bug fixed!
Merge pull request #1 from siamaksg/master

Bug fixed!