Merge pull request #138 from 6thimage/master