Merge pull request #25 from torijule/master

Merging master
updates