Merge pull request #7 from mredar/master

Merge no-op merges