Version update
general update
Merge remote-tracking branch 'origin/master' into brandon-update
Correcting some issues
Fixed some generation issues.
version fixes
Merge pull request #51 from branflake2267/brandon-update

Brandon update