Merge pull request #121 from frederikmoellers/master