Merge pull request #1 from gone369/master

removed bad trunk