Merge pull request #1 from paraffa/master

come on