Alexeykuzmin master

I've made some changes, and I made this working on existing projects. I need to polish a bit the documentation before pushing this in the master.