Merge pull request #16 from rasmushaglund/master

Mega Pull
Merge pull request #110 from RikardNordstrom/master

Merge pull request #16 from rasmushaglund/master