Merging changes from ayrton04's repo