final commit.
Merge pull request #55 from thrau/master

final commit.