Merge pull request #121 from fkrull/master