Minor changes. [VERSION-0.1]
Added latest changes.