SPIE Montreal 2014
Merge branch 'devel'