Fix up some things
Merge pull request #13 from unikent/master

Fix up some things