Adding assets adapted from fork
merged with origin/master