ENT-0001
Merge pull request #1 from finger75/master

release-1.0