Merge pull request #37 from dizzzz/develop

Attempt to restore 2.1 compatibility
Merge pull request #38 from dizzzz/develop

Bump to new version
Merge pull request #39 from dizzzz/develop

Be sure the generated build directory is cleaned when required