Merge pull request #67 from kberg/master