Merge pull request #10 from adamcandy/master

Bring dev up to date with master