new feature ...
fixes some bug
Merge branch 'develop'