Adriansbranch

Going to pull Adriansbranch as well as master branch