merge with pr #11