Initial version
Fixed a bug
clean up
Merge branch 'master' of https://github.com/overengineered/Composer