Put worksets on the map
minor cleanup
Merge branch 'master' of https://github.com/catami/catami