Merge pull request #46 from tyleraadams/master

merge conflict