Shell fixes..
Merge branch 'master' of git@github.com:TatrosRajSouza/BasicStorageServer.git