Merge pull request #108 from kberg/master