Merge pull request #3 from finger75/master

v2.0