Merge pull request #12 from vitiv/master

Merge core->master
Merge pull request #13 from vitiv/core

Merge pull request #12 from vitiv/master