Version 0.6.0 (major rewrite)