Version 0.1 done and tested