Enhancements from #74

Clean commits from #74 on top of master.