Streamline

Merge the [streamline](/fdurgn/alpaca/tree/streamline) branch into the [master](/fdurgn/alpaca) branch.