Master 0.1.1

Fixed tests