Merge pull request #10 from GawainLynch/master

Next set of changes