Update
Merge remote-tracking branch 'upstream/master'
Merge pull request #7 from mtan810/master

Minor edits/fixes