Co-authored-by: Daniel Thwaites <danthwaites30@btinternet.com>
Fixes #35 and #59 Co-authored-by: Daniel Thwaites <danthwaites30@btinternet.com>