Merge pull request #13 from yebudar/master

1.2.0