Issue #363 - Fix Bug
Issue #363 - Add Tests