Fixed issue #25
Merged