Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
new changes
new styling
dudeman
Merge pull request #14 from genenettles2/master

new request from Nettles