fixing shell application
preparing for merging with master