Your fixes and mine

It already passed in 
https://circleci.com/gh/OhmData/c5/tree/your-fixes-and-mine