Fixing issues to PR https://github.com/james2388/RWLab47/pull/1