Merge pull request #1 from bschousek/master

merge master into gh