Merge pull request #47 from megamsys/0.5

0.5 release
Merge pull request #50 from megamsys/master

Merge pull request #47 from megamsys/0.5