* Fix for issue #118 * Adding test cases for fix #118 * Moved the namespace in using block for fix #118