added finish controler
Merge branch 'master' of http://github.com/massiveclouds/hackathon