Some fixes
Merge pull request #7 from rusvicious/unstable

Some fixes