Merge pull request #2 from Mo-Things/master

stuff
Updated
Merge pull request #7 from hii488/master

Tidying up