core: fixed compilation errors on lucid/precise
Merge pull request #413 from euroelessar/master

core: fixed compilation errors on lucid/precise
Merge pull request #412 from shaitan/master

Pytests and fixes