Merge pull request #128 from hansva/master