Merge pull request #1 from elruwen/master

fix
Merge pull request #1 from melbjvm/master

Merge pull request #1 from elruwen/master