Merge pull request #38 from ciubotaru/unstable

Unstable
Merge branch 'unstable'