merge changes from #11