pushing changes from rubelux yaarns
Merge branch 'ruben'