removing commented code
Fixing null value belongsTo bug (Closes #123)