Merge pull request #5 from sweetlilmre/master