Merge pull request #1 from Mariopilot808/0.2

0.2
Merge pull request #2 from Mariopilot808/master

Merge pull request #1 from Mariopilot808/0.2