Merge Fork's develop into origin's develop

Grabbing [boilerplate Javadoc](https://github.com/Hornswaggler/fuzzy-octo-shame/issues/5).