merged my bug fixes with kyle's new features
upvoting fixed + kyle's new features
Merge pull request #8 from manleyhimself/merge

Merge