Merge pull request #106 from kberg/master