Issue #42 Made changes based on review comments.