imeyer Merge pull request #15 from otheus/patch-1