Merge pull request #18 from enolfc/master

Preparation of release 0.5