Merge pull request #19 from jemble/master

Pull From Master
Merge pull request #20 from jemble/master

Pull From Master
"Loads" of changes
Merge pull request #11 from jonathanworth/master

get latest changes