0.6.0 new

All features in this branch are good to go for the next release.
Done and merged with current master