Resolved issue #41
Merge branch 'working'