Various bug and style fixes
Merge pull request #138 from obiba/fixes

Various bug and style fixes