Version 2.0
Merge pull request #1 from rapsy03/master

Version 2.0