As requested here is a PR of my fork #1

Merged
merged 5 commits into from May 25, 2012