Merge pull request #47 from megamsys/0.5

0.5 release
Merge pull request #48 from indykish/0.6

Merge pull request #47 from megamsys/0.5