Fixed issue #7
Fixed issue #10
Merge branch 'maw'