First Versions
Merge pull request #2 from AlpacaFan/JohanWorking

First Versions