Merging changes from Casper
Merge pull request #1 from JTarasovic/master

Merging changes from Casper