Version 0.3

Fixing issues pointed out by Eric