Fix for issue #2.
Merge branch 'jerej-feature-A'
user jerej requested to add this reference issue #2.