Removing boost dependency (yay!)
Merge remote-tracking branch 'origin/master' into reflect_refactor