Merge pull request #1 from dbkblk/devel

Merge v0.5