Syncing gtkrug's view

Syncing gtkrug's view