Fixing some bugs.
Merge remote-tracking branch 'upstream/master'
Syncing upstream changes
Merge pull request #12 from johnb30/master

Fixing some bugs.
Making things work.
Merge pull request #15 from johnb30/master

Making things work.
It actually works now.
Merge pull request #16 from johnb30/master

It actually works now.