Revert "Merge"
Merge pull request #3 from M10360/revert-2-master

Revert "Merge"