Version 2.6.1

Bug fixes, new features, things and stuff.