Fix compiler warnings

This 2 commits fix #41 and fix #42