Merge and revert fix

Now develop and master are identical v0.2.6