Orgfix-done.tested ok!
efewrfMerge remote-tracking branch 'origin/0.5' into 0.5
Merge pull request #33 from morpheyesh/0.5

Orgfix-done.tested ok!