Changed a few System.out calls to System.err for appropriate messages
Merge remote-tracking branch 'origin/master'