Rename the conditional map insert operation
Merge branch 'dev'
Merge branch 'master' of github.com:AaronFriel/hyhac