Merge pull request #1 from AlexMl/2.0

Final Merge of Update 2.0
New beta version