Reverting merge
Merge pull request #63 from kkronenb/master

Reverting merge