Merge pull request #18 from damienlevin/master

Small refactor with stash trait