Upgrade to Pagon 0.6.1