Merge pull request #45 from eaburns/milestone/live

Milestone/live
Play with the size of the box

Fixes #49
Merge pull request #50 from skiesel/dev/skiesel

Play with the size of the box
Merge branch 'master' into newrss