Merge pull request #1 from hyphenlab/master

Pull from master to devel
Merge pull request #2 from hyphenlab/devel

Merge pull request #1 from hyphenlab/master