Merge pull request #23 from jsicree/master

Synching dev with master