Merge pull request #1 from hyphenlab/master

Pull from master to devel