2014-07-30
Changed #defines