Merge pull request #1 from ChieveiT/master

ChieveiT : pull from upstream