Fixed a bug that has been in the code for 10 months
Merge pull request #6 from hazamajaza/master

Fixed a bug that has been in the code for 10 months