1.2 version cleanup added
Merge pull request #2 from mertkavi/master

3.0 version upgrade master branch