Cleaning system.run code.
Fixing bug #126
Merge branch 'clean_container'