Merge pull request #2 from wintergolem/master

Test
Merge remote-tracking branch 'upstream/master'
end of day 2/21