1.5.0.20 dev

couple of fixes and formatting.
Merge pull request #3 from DejaVu/dev

1.5.0.20 dev