Updating develop with release 0.2