Merge pull request #5 from rusvicious/unstable

Unstable to master some fix
Some fixes