Version bump. Merged several PR's