Merge pull request #24 from aelgru/master

Ensuring config viewer data will not be overriden.
Measuring time for performance tweaking.