Reduce complexity
Various fixes
Merge pull request #10 from fire015/v1.5

V1.5