1.2 upgrade
Merge pull request #7 from raviosc/developer0123

1.2 upgrade