First try at July 10 update.
Merge pull request #23 from practicalswift/master

First try at July 10 update.