modified 0.1 release branch