Merge pull request #127 from hansva/master