Fix for #120
Fix for #94
Added root to root list before callback
Mobile changes
Merge remote-tracking branch 'upstream/master'