fixed << being called on nil
Merge branch 'jonas'