Some fixes
Merge branch 'some_new_features'
Some fixes