Feature

Please add these features to the develop branch