Merge with R2 mpawlak
Merge pull request #10 from kkolodziej/CopyofRelase2.0

Merge with R2 mpawlak