Merge pull request #112 from mejas/master

add user core