Beta 3

Beta 3, Merged with master