Merge pull request #69 from kberg/master