Taking care of empty nodes
Merge branch 'score' of github.com:nicolashincker/i-score into score