Merge pull request #1 from jonnyguio/master

Are you feeling frustated?
Well...