fetch
Merge remote-tracking branch 'upstream/master'
user input
Merge pull request #2 from DaemonAeon/master

user input