Merge pull request #9 from bobbyc/dev

Update
Merge pull request #10 from bobbyc/master

Merge pull request #9 from bobbyc/dev