Merge pull request #13 from eucalyptus/master

Merging from upstream
Temporary logging changes
Merge pull request #40 from gregdek/master

Temporary logging changes