Some fixes
Some fixes
Merge pull request #8 from rusvicious/unstable

Unstable to master