Merge pull request #11 from luisfontes/master

converted from davidrios tm bundle
Prepare 0.2.0 release
Merge pull request #1 from devongovett/master

Update from original