Merging actionshrimp's patch into my fork
Merge itagenten and mine
Merging itagenten and mine again
Final merge of itagenten and mine