Merge pull request #14 from shortOS3/Alex

finished?
finaly done