aghaynes Merge pull request #55 from aghaynes/master