Merge pull request #15 from jsicree/master

Pull request to sync dev with the master