Review and enhanced input parsing
Merge remote-tracking branch 'origin/master'