Merge pull request #1 from rusvicious/unstable

Unstable to master
Merge branch 'unstable'
Merge pull request #2 from rusvicious/master

Emty :)