Merging 0.1/master to master