Merge pull request #26 from Ekhoo/master

Faster better stronger!