Resolved Github Issue

Resolved #333 
Resolved issues reported by Internal QA Team.