Merge pull request #32 from infrastation/master