initial local commit
Merge https://github.com/schmittens/schmittens_beta_0.2
test
ss