Made fixes based on PR #19 comments