Updates for latest contributions (#73 and #74)