Fixed issue#51
Merge branch 'Warning-issue51' into develop