Removed magic number, replaced with #define
Merge branch 'master' of http://github.com/richteer/iiag