Bug Fix Issue #13
Issue 12, 13, 14