Merge pull request #11 from ktekinay/master

Modified VBWFS module
Merge pull request #10 from arbp/master

Merge changes