Added step fixing (#5)
Added  fixings for errors (#6 #7)