Develop

think it's best to merge my changes now and in the future commit directly to the repo if that's OK. if not we'll be to much out of sync me thinks...