First commit after forking

Doing my pull request over here!