Merge pull request #181 from kberg/master