merged with bripkens-master