Final commit for Beta 0.1