Include fix from #35
Fix messages