Fixes for [issue 14]

Review Changes