minor bug fix and updates to gitignore and apigen files
updated .gitignore
Completed: #6, and some minor bug fix
Merge pull request #7 from shalomsam/v2.x.x

Resolved: #6