Resolved #54
Merge branch 'working'