Testing

Frank, a few small changes just to try the workflow. Let me know if it makes sense. I have tested on OSX/2014b and Win7/2010b.