Fix issue #25
Merge branches