Add functionality contributed to master missing from 0.4