Merge pull request #56 from jonadem/patch-1