Merge pull request #1 from chronokings/master

Updated master