Added feature 002
solved some bugs
Merge branch 'release/release-002'