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

Various bug and style fixes