Merge pull request #38 from ciubotaru/unstable

Unstable
Merge commit '8cf8b26f74068440df2190fc0bbc33cf1640532b'
Merge branch 'unstable'