Code style fixes
Documentation update
Merge pull request #21 from yakky/feature/disable_fixes

Feature/disable fixes