added focus
Merge branch 'master' into focus
rebasing
Merge pull request #6 from topcoat/focus

Focus