Merge pull request #31 from achbed/dev-stationfolder

Three new features, and a bug fix in a pear tree
Merge remote-tracking branch 'remotes/upstream/dev' into dev