Committing stub fixes
Merge pull request #8 from mohanvive/master

Committing stub fixes