Fixes Issue #13 Aug 6