Merge pull request #4 from mcauser/v2

Version 2