Merge pull request #16 from ubermichael/master

Merge import commands into master