update for cur
Merge branch 'master' of github.com:svtter/workspace