Some utilities I've found useful
Fixed missing files in test project
Added features requested by #25 and #26.