Fixes #2 and #3
Merge pull request #4 from reetikar/waddup

Fixes #2 and #3