junosuarez Merge pull request #6 from zwhitchcox/master