Still Testing #215

Still Testing #215
Merge pull request #1127 from ptariche/patch-13

Still Testing #215