Merge pull request #3 from finger75/master

v2.0
Merge pull request #4 from finger75/release

Merge pull request #3 from finger75/master