Update to 2.1 WFK
Merge pull request #5 from TejasM/update

Update to 2.1 WFK