Patch 14

B261
Patch 15
Merge pull request #246 from xToken/Dev

Patch 14 & 15