Version 0.7.4, #44 in progress