make-improved: merge improvements from staging tree
Merge pull request #27 from pfactum/make-improved

make-improved: merge improvements from staging tree