Merge pull request #32 from Frostlock/master … 

Monster work
latest commit 4de8572ed2
Joe authored