Double template and some methods added to avoid duplicate requests
Package refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md