Merge branch 'marseneault-master'
fixed indent to prevent error