Merge pull request #4 from Xuno/current-work

merge Current work for version  v0.02
Merge remote-tracking branch 'origin/current-work'
Merge remote-tracking branch 'origin/current-work'
Merge branch 'master' into cw-merge