Some updt
Merge pull request #1 from hauntd/master

Some updt