Merge pull request #10 from adamcandy/master

Bring dev up to date with master
Merge pull request #11 from adamcandy/dev

Merge pull request #10 from adamcandy/master