Working copy

Merge my working copy with master. minor changes