ohitz Merge pull request #2 from chuhn/master