Added circle functionality. Closes #24