Merge with updates from cweiske/master