Fix for issue #12 ... Review comment addressed
Fix for issue #12 ... Review comment addressed

projectOpenRAP/OpenRAP,projectOpenRAP/OpenRAP,projectOpenRAP/OpenRAP,projectOpenRAP/OpenRAP,projectOpenRAP/OpenRAP