141210 - format and content changes
Merge pull request #17 from igoryen/141210

141210 - format and content changes