Fixed includes (#17)
Merge branch 'feature/cplusplus' into feature/bgzip