move comands unified
Merge pull request #5 from 1ton/master

Fixes in server