defines as requested
Merge remote-tracking branch 'upstream/master'
Merge pull request #69 from mikeneiderhauser/master

defines instead of code block