Merge pull request #206 from kberg/master