Merge pull request #42 from larsssono/master

Minor cleanup and fixes
Support for wikis