Cleaning
Merge pull request #7 from jubianchi/master

Trying to clean some things a bit...