Changes due to overlord commons improvements
Merge pull request #134 from EricWittmann/master

Changes due to overlord commons improvements