Merge pull request #14 from eucalyptus/master

Merge upstream changes
Remove debug breakpoints
Merge pull request #42 from gregdek/master

Remove debug breakpoints