Merge pull request #12 from vitiv/master

Merge core->master