0.3.0.dev merged with bwhaley