#35 working on 0.5.0