Multi-pull

This should address the following issues:

* #119
* #121
* #124
* #127
* #128