merge development branch

Nevermind! I just noticed `if options[:shuffle]`. Prefer `def initialize(shuffle = false)`