work in progress
Merge remote-tracking branch 'upstream/master'
Merge pull request #8 from ntlam/master

The Greatest Pull Request of All Time