Initial commit
Adding ruslan contribution.