Merge pull request #1 from jxson/master

updates from LAHacknight