commiting changes
Merge pull request #17 from mmanika/master

commiting changes