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

Fixing some bugs.