Working beta version 0.1