Resolved #54
Merge branch 'working'
Resolved issue #55
Merge branch 'working'
Resovled issue #57
Resolved #56