Merge pull request #55 from SWITCHSCIENCE/minor-fix

Minor fixes