Merge pull request #158 from tylertadej/sprint6

Method refining