Designated mandatory and optional field and fixed references throughout the codebase
Update to gitignore
Merge to master
Bug fixes
Merge pull request #201 from rhefner1/issue-194

Issue 194