Refactor for major version update
cleanup
More cleanup
Merge pull request #2 from appurify/twang_update_major_version

Refactor for major version update