Fixed styling and added functionality.
Merge pull request #18 from b91961/master

Fixed styling and added functionality.