267 Beta
More fixes, still atleast 1 outstanding
Merge pull request #42 from xToken/dev_267

Build 267 updates