Merge pull request #2 from mlantz/dev

Dev
Merge branch 'master' of https://github.com/mlantz/quarx