Resolved #96 and also resolved #120

Styles changed according to issue.