Version bumped for 0.6.0 release
Fixed up includes