minrk Merge pull request #59 from djcomlab/master