Fraenke75 request handlers 

Merged with master and did a few changes in the last 2 commits