Merge pull request #7 from museoXela/master

Taro modifications