The final push!

+ Fixes for #590 and #591