Item + cleanup
Merge branch 'master' of github.com:doromos/icarus