Fix issue #1.
Merge branch 'Issue1' into develop