Merge pull request #107 from kberg/master