Merge branch 'sjfahr-master'
Merge pull request #17 from ImageGuidedTherapyLab/master

Merge branch 'sjfahr-master'