Merge pull request #42 from Magenic/master

Merge from Master
#170, changed image dimensions from magic numbers to constants.
Merge pull request #177 from Bowman74/master

 #170, changed image dimensions from magic numbers to constants.