Merge pull request #23 from jsicree/master

Synching dev with master
Merge pull request #24 from jsicree/dev

Merge pull request #23 from jsicree/master