Re-adding comment
Fixing defines variables
Merge branch 'build_revamp'