Merge develop for release
bumped to version 3.1.0