Adding remaining changes. Code was not written by myself - it was in a pull request by trollixx
Adding remaining changes. Code was not written by myself - it was in a pull request by trollixx