Merge pull request #580 from mcmonkey4eva/master

Bug fix pull request, woohoo