Merge pull request #7 from SoylentGraham/master

Sync from master
Merge pull request #8 from SoylentGraham/PopTrack-Laptop

sync with master
Merge remote-tracking branch 'origin/master' into PopTrack---desktop