Merge pull request #81 from kberg/master