Small refactoring; add ability to run through pipe
Version bump to 0.0.2