Update to support custom titles, other changes
update unit test
Merge pull request #5 from jamsyoung/updates

Update to support custom titles, other changes