attempt to properly sync upstream and master
Merge pull request #18 from left23/master

attempt to properly sync upstream and master