Merge pull request #2 from sphere/alexander

Alexander
Merge pull request #3 from sphere/staging

Staging
Merge pull request #4 from sphere/alexander

index
Merge pull request #5 from sphere/staging

Staging
test