Merge develop back to main#51

Phergus merged 4 commits intomainRPTools/parser:mainfrom

developRPTools/parser:developCopy head branch name to clipboard