merge with upstream
Merge pull request #133 from shutter111/master

merge with upstream