Merge pull request #74 from jacobwagner/master

removed auto destroy as it is bad