Merge pull request #126 from 4679/master