commiting stuff
Merge pull request #3 from fotuzlab/1.x-dev

commiting stuff