Version bump: Merged additions made by @kronn