Beta v0.3 / fix remove bug
Merge remote-tracking branch 'remotes/origin/master'