Fortsat på gemmeting
Merge pull request #21 from alfeko/alexbranch

Alexbranch
Fixed branch
Merge pull request #23 from alfeko/master

Updated with master