2°
Merge pull request #3 from xantrix/feature1

2°