Finished first version
Merge pull request #1 from erikasv/initial

Initial