Added increased documentation
Merge branch 'gui'