v0.1.3.2
some rearrangements, adding new functionality
Merge remote-tracking branch 'origin/master'