Merge pull request #130 from nijil/master

Setup Issue Fixed