Sync with master and commit d888cc8242dcc19f61e55bc37c5555a069b59e85
Merge pull request #122 from rterbush/sync-with-master

Sync with master