Updating Master with release 0.2