modular build code optimization + some extras
Merge pull request #1528 from raymix/master

modular build code optimization + some extras