#4 Added compatibility for Confluence v5.x