Merge pull request #124 from hansva/master