Merge pull request #109 from kberg/master