Merge pull request #1 from ParabolicMinds/kallikrates

Kallikrates
Merge pull request #2 from ParabolicMinds/kallikrates

Kallikrates
Merge pull request #4 from ParabolicMinds/kallikrates

Kallikrates