Final commit for first beta version! :)