Merge pull request #61 from freedomofkeima/master

tehe pero :P