Merge pull request #104 from kberg/master