Upgrade to 0.7

Pulling latest changes from webconvforge - upgrade 0.7 branch.