Merge pull request #28 from subutai/master

Cleanup