Merge with master

updating msgpack with int key support