Update 0.3

Cleaner version of 0.2