Merge pull request #24 from megamsys/0.5

0.5 release