Version 0.1

FInal improvements