Merge pull request #108 from talentral/master

a bunch of stuff for stripe