Fixed issue #9
Fixed issue #8
Issue #5
Fixed Issue #7
Fixed conflicts