Merge pull request #8 from cabrelkemfang/master