merge conflicts ;)
Merge pull request #58 from missinglink/patch-1

merge conflicts ;)