fix std imports
Merge pull request #44 from kud1ing/master

Port to latest incoming