Added new features for next release
Fixed a small bug, and made version ready to merge with master
Merge branch 'next'