Made the initial changes pertaining to Issue #1
Fixes #1