correct use statements
Merge pull request #1604 from dereuromark/3.0

correct use statements