added content type handling
added content type handling
Merge remote-tracking branch 'origin/master'