New Release 0.2.25

Solved Enhancements #2 + #4