O section added + some fix on N section
Merge branch 'master' of https://github.com/ekramian/Projects