Fixing trivial issues from Issue #17
Merge branch 'addressing_trivial_stuff_from_issue17' into develop