updated everything
Merge pull request #17 from mesqueeb/patch-9

updated everything