Adding changes from #53