sorry fixed the merc error
Merge branch 'master' of https://github.com/Hsad/Cocaine