Something went wrong with merging
Merge pull request #398 from jsassner/master

Something went wrong with merging...