Tweaks
Merge pull request #1 from snowysylph/master

Tweaks