Cleaned up the code (a bit), added options support. Yay for 0.0.2 !