Merge pull request #190 from aeruder/master