Added some things
Merge pull request #1 from geraintpalmer/master

Added some things