Initial Commit

exact copy of v0.2.5_(1029)