adding get token method
fixing filter
removing duplicate code
fixing docblocks
fixing response
merge develop