Separate use statements
Merge pull request #163 from g3dut1s/master

Separate use statements
Merge branch 'master' into 1.3.x