Merge pull request #1 from ikkentim/master

Pull from upstream.