Refactor
Merge remote-tracking branch 'devmjones/master'