Improved shell; solved to #14