re-arrange. do null in the end!
Merge pull request #10 from zimmerst/integration

re-arrange. do null in the end!