Fixed up includes
Final release for 0.6.1