Finishing bug fix
Merge pull request #11 from Ahineya/master

Finishing bug fix