Fixed broken tests in test_format.py
Merge branch 'issue_5' into light_fixes
Merge branch 'light_fixes' into issue_11