Merge pull request #1 from cano64/master

Moo?
Merge pull request #2 from cano64/master

clean up