Sync with master branch and commit 9071fc6603c1dc1022b5dc3fe6df16066e31150e
Merge pull request #118 from rterbush/sync-with-master

Sync with master