stripe implemented
merge with master