Resolves #102
Merge branch 'master' of https://github.com/elieish/yard