Re-factoring: reduce global variables
Bump up version and update Changes