Merged 0.1.x into master branch

using --no-ff