Merge pull request #39 from david-on-github/develop

sync