Issue #4, issue #5. Prepping for 0.2.3