Merge pull request #1 from shashank-agg/master

sync with original
added wasd