Merge pull request #16 from rasmushaglund/master

Mega Pull