Updated Shell.java
Merge remote-tracking branch 'origin/shell' into shell