Edge cases

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
Merge branch 'master' of https://github.com/samphippen/ggj2013