new topic stuff for testing
Merge pull request #1177 from mattshel/041813

new topic stuff for testing