Some modifications
Added class
Improvised
Cleaned up for fast upload
Merge pull request #1 from nootanghimire/master

Improvising