Shell and API Speration
Simplified Shell
Code clean-up
Merge pull request #84 from spolu/shell

Review: Shell & API