Develop

I hope I'm merging progschj work into my branch.