small things
Merge branch 'hardfork2' of http://github.com/wolfbiter/linx into hardfork2