Merge pull request #75 from starverte/master

Bad