Merge pull request #15 from jsicree/master

Pull request to sync dev with the master
Merge pull request #16 from jsicree/dev

Merge pull request #15 from jsicree/master