djgagne Merge pull request #43 from djgagne/djgagne