And the sun shines once again
Merge pull request #307 from DirkyJerky/master

And the sun shines once again