shaking..
Merge pull request #3 from nilay/w2

shaking..