Improvements

* #11, #12 should work now