Merge pull request #32 from carlu/master

Several small changes