Clean up some loose ends in 12.04
Merge pull request #20 from kalamuna/12.04

Clean up some loose ends in 12.04
Merge pull request #21 from kalamuna/master

Merge from master