merge current develop branch
Crypto++ is now a submodule