Proposed fix for issue 51
Added history item for this fix
Bumped version number
Added regression test for issue 51
Merge branch 'issue51' into issue51-test
Updated history for release