Merge pull request #127 from kberg/master