Commit cd33d2757ce5620f2196017b32c82e17ce24594b

eustas 2016-06-14T16:06:45

Merge pull request #373 from eustas/v0.5 Rebase