REV-6 #comment Fixed bug #done
Merge pull request #7 from asafza/feat5

REV-6 #comment Fixed bug #done