Merge pull request #3 from mfanafuthi/master

uptodate