Merge pull request #138 from increpare/master

pull