Merge pull request #1 from divasoft/common

Common
Merge pull request #6 from alexverb/common

Common