8.0 analysis 20140923

Includes #102 and #103, so please wait with your review until these have been merged.