V 0.3.2
Merge branch 'working'