Added files from mcunhas fork