hotfixes and started #145
Merge branch 'master' of http://github.com/wolfbiter/linx
hotfixes and started #145