Working on issue #8
Working on issue #8
Added test class for issue #8
Removed some degug information issue #8