Master branch updates

Heya! Lots of changes happened since you forked. :)