Merge pull request #24 from megamsys/0.5

0.5 release
Merge pull request #25 from indykish/0.6

Merge pull request #24 from megamsys/0.5