wikitopian Merge pull request #30 from adammulligan/master …