reorganized code
Merge commit '08b7675'
fixed merges