Initial Repository Setup
Merge pull request #1 from dkorff/Upgrade

pull latest 2.5