Semantic, organizational things
version bump to 0.2.1 (versioning changed, see revised changelog)