Updating files.
Merge branch 'stratanyc'