Merge pull request #68 from jodiecunningham/master