Merge pull request #1 from Tablesalt/master

i wanna merge some branches