fixes (pre testing)
Merge branch 'master' of https://github.com/mateusmaso/hipbone