added new feature
Bugfix
Merge branch 'release/1.0'