REV-5 initial commit
Merge pull request #5 from asafza/feature3

REV-5 initial commit