0.5

Upgrading master to 0.5