Merge pull request #141 from hazendaz/master

More test and warning cleanup