Start of 267 compatibility....
268 Compatibility
Merge pull request #264 from xToken/dev_267

B267 and B268 Updates