Merge pull request #153 from jzgg/master