Merge pull request #2 from lmcprod/master

pull changes from prod
Merge pull request #1 from lmcrec/master

pull changes from rec
adding a new file to branch 3
Merge pull request #3 from lmcint/branch3

Branch3
fixed issues
Merge pull request #4 from lmcint/branch3

fixed issues
Merge pull request #3 from lmcrec/branch3

fixed that awefull issue