Updated to 2.5 version
Issue #1: fixed
Merge 0.2.5