Merged with Simon
Merge branch 'master' of git://github.com/BIC-MNI/minc4itk