bumped version
addressed the issue with merge and the package dependences
merge master into develop