Merge pull request #1 from spil-jasper/master