Merge pull request #50 from lauriii/lewisnyman-automated-testing