randPos inplemented
Merge origin/master