Iss47

Changes related to issue 47 (review). Tested in dev environment.