handle defaults
Merge pull request #17 from dhanuka84/master

handle defaults