Merge pull request #114 from megamsys/0.5

0.5 release