Merge pull request #55 from traviscross/master

Thanks for the contribution.  I am seeing one compiler warning with this commit.  I'll fix it after the merge.