Version 0.2.5

Several bug-fixes