Bugs cleaned
Merge branch 'master' of https://github.com/Njinu/thriftIteration2