some small changes :)
just testing
Merge branch 'gsitter' of https://github.com/chartinger/catroweb into gsitter