johnnovak Merge pull request #3 from n1try/master