changes
Merge pull request #26 from mwernimont/master

changes