fixed #826
Merge pull request #4 from vbawol/master

Updating Repo from vbawol:master