misc()
Merge pull request #19 from perrinood/merge-misc

misc()
git(merge) : merge conflicts.