Merge pull request #37 from johanjusits/laptop-branch

Laptop branch