Merge pull request #11 from RandomCodeFG/master

index again! :P