Fix #10
Merge branch 'working'