Update with newest commits

Hope i'm dong this the right way :) Want to update my repository