eliooses Merge pull request #138 from gonchs/master