Merge pull request #200 from randy-waterhouse/master

Small fixes.
OTASCIIArmor.h pre-compiler fix.