Updated to v0.2.5-beta

version change because A lot of code to cleanup and reorganize due to
versions 0.2.3 & 0.2.4