Merge pull request #1 from thejacobpollack/master

Merging sandbox and master.
Merge pull request #2 from thejacobpollack/master

Merging sandbox and master.
Fixed typos
Merge pull request #3 from thejacobpollack/sandbox

Sandbox