Last changes
Merge pull request #8 from Stinktier/master

 Last changes