basic package, hand tested in isolation
merging dev into master