Updated to include fix from #3