Fixed POD.
Added small fixes after implemented new Unit Tests.
Initial Version.