Updated
Merge pull request #1 from amanthedorkknight/master

Updated