scn viewer
scn conflict merged
Merge pull request #100 from victorpylinsky/master

done issue #101