merge changes from hammy