Add some features and remove replication of code

[badarshahzad]

Description: This application is working and has two version. This application could be extend more by add multiple features.

[jakepatzer]

Hello, I'd like to contribute to this project if that's okay!

[badarshahzad]

You are most welcome.

[badarshahzad]

@jakepatzer if you wanna contribute simply fork and clone the repo. After that made some changes which think good for this repo. Then simply commit and send a pull request I am waiting for your response.

[sarathpetec]

Is it possible to take a glance, perhaps? :)