Merge pull request #97 from HeroesGrave/master

Remove lifetime notations causing errors