Merge pull request #225 from increpare/master

pull
compile