Merge commit '077ac2032f8c08a034a2f16a0185ac648919fc54'
Merge commit '9272724649cb6f05a212b808b863c579607d5491'
Fix Issue #109
Merge pull request #111 from allenxwang/master

Fix NPE in ConfigurationManager.loadProperties()