Fixed bug reported on issue #25
Merged branch issue25 into develop