Feature2

Please add these nice features to develop branch.