Merge pull request #1 from stevekellogg/master

Well done steviepoo well done
Change from time fork
Merge pull request #1 from timbob1000/master

Let's rebase this MoFo