B2 - 318582
B4 - 246263
Merge pull request #8 from DrMGC/drmgc

B2 - 318582