Merge pull request #1 from dbkblk/devel

Merge v0.4
Merge pull request #2 from dbkblk/master

Merge pull request #1 from dbkblk/devel