Resolved issue #55
Merge branch 'working'