More fixes for PR #23.
Some tests for PR #23.
Formatted Consts.cs
Added test for the issue #9.
Fixes issue #9.