Merging new features to master

New features recently merged to staging and now fully tested are going to be merged to master.