Merge pull request #1 from silshack/master

update merg
ignore pyc files
Merge pull request #10 from jpulliza/master

Tell Git to Ignore .pyc files
Better, correcter function definitions
Merge pull request #12 from eah13/master

Better, correcter function definitions