Merge pull request #5 from spikey360/master

im NoWork.com :(
first viable
Fixed conflicts