Updated issue #373: Removed system/profiler
Updated feature: Constants refactoring
Merge pull request #483 from sergeyklay/master

Some refactoring