jo Merge pull request #1 from gamma-dj/master