commiting 2.0
Merge pull request #2 from agsalin/feature2

commiting 2.0