Fix #36
Merge branch 'working'