Updated in Version 1.0 Branch