updates
stopped to merge in master changes
Merge branch 'master' into xmlwriter

merging in changes made to master..
finished xml output