Add pick, shovel, sword;
Some improvements;
Merge remote-tracking branch 'origin/master'