Merge pull request #1 from Mariopilot808/0.2

0.2