Merge pull request #63 from kberg/master