Release/0.1a merge back