Feature/us1

pull feature into master