all of the updates
Merge branch 'master' into updates
Merge pull request #2 from tarebyte/updates

Updates