Merge pull request #11 from MrBean83/fix_this

Fix this