Merge pull request #1 from ImageGuidedTherapyLab/master

param updates
Merge pull request #2 from ImageGuidedTherapyLab/master

updates
Merge pull request #4 from fuentesdt/master

cleaning up