Branch of https://code.google.com/p/osghimmel