Merge pull request #1 from tcsorcs/master

some shits.