Fixes #100. Check for keys rather than compiler directives
Merge master
Launch images to #ff8641