beta 12 release
Merge pull request #26 from rivernate/2.0.x

beta 12 release