update1 for 0.5
Merge remote-tracking branch 'origin/0.5' into 0.5
Merge pull request #7 from indykish/0.5

0.5 update 1.