hrbrmstr Merge pull request #12 from hrbrmstr/master