Beta 0.3

Changed master to Beta 0.3