Merge remote-tracking branch 'origin/master'
Issue #4 resolved, user input reordered