made imports more explicit, fixed some documentation and cleaned up the main function a bit
Merge pull request #2 from kqr/master

made imports more explicit, fixed some documentation and cleaned up the main function a bit