ben's changes
Merge pull request #36 from BenNgu/master

ben's changes