Version 1.2.0

This PR give some love to this extension.
Fixed issue #21 and #22