Fixes #103 and uses title() instead of capitalize() in a couple of places.