Merge pull request #13 from aiq/master

two little cleanup fixes