Several fixes and tweaks. Closes #2.
Slightly extended README