Merged the PullRequest #1 and added some cosmetics