Merge of source code from different developers

Merged differend extentions from community and me