Epic code added, must merge!
Merge pull request #1 from Weedlepickles/Johan

Epic code added, must merge!