Merge pull request #2 from brumar/master

hihihi