Split camel-case more completely

This takes care of issue #22. It isn't very elegant, but it gets the job done.