updated to allow hash objects
updated to allow hash objects
post merge