Merge pull request #23 from kilimchoi/benortiz

Benortiz
some more cool shit