Merge pull request #55 from craigcitro/toplevel_custom