Latest updates
Merge pull request #47 from wesbos/master

Latest updates