Merge pull request #123 from tnull/patch-1