working branch
Merge pull request #39 from peasantpalate/calvin_feb26

working branch