Fixeds
Merge branch '0.1', remote-tracking branch 'origin'