Merge pull request #2 from sigurdsvela/master

Alot