fixed
Merge branch 'sprint-2' of github.com:vinsol/vammer into sprint-2
fixing changes
fix naming issue
improve naming
make private methods
fix fixes suggested by akhil sir