Add fields as specified in Issue 13
Merge pull request #14 from alim/Issue_13

Add fields as specified in Issue 13