Cosmetics
Merge pull request #64 from umpirsky/fix/random-fixes-29-03-2013

Cosmetics