Updated lots
Merge pull request #10 from jonathanhaggard/master

Updated lots