updates
updates
Merge branch 'master' into newb
completion fix
Merge pull request #42 from ffmegaman/newb

Newb