Gwtrar 1

Merging all changes to the master branch