Merge with alpha, version 0.0.2