Preparing working 0.1 version