Added several features
Final 2.6.0 commit