Merge pull request #159 from avelino/master

upgrade 0.2.x