Shell and bugfixes
Merge pull request #1 from Th3Falc0n/master

Shell and bugfixes