Some fixes.
Merge branch 'master' of https://github.com/AndrewTrebuhin/billboard

Yaarrr!