Code

Merge from gitk