-polishing code
-add new features
Merge pull request #3 from germaniteen/vintu/2891204

-polishing code