Master fix 1
Master fix 2
My first feature commit