Patch 8

RTM
Merge pull request #241 from xToken/Dev

Patch 8