String is ready to hash... cleaned up the formatting a little for ease of reading
Merge branch 'master' of https://github.com/accidentalManual/1653
Merge branch 'master' of https://github.com/accidentalManual/1653