Some changes for beta
Merge branch 'master' of https://github.com/r1d1/showyourstuff