Merged all remaining changes and released 3.1.0