Merge pull request #69 from greenTara/1.01-dev

1.01 dev
Merge pull request #70 from greenTara/1.01-dev

1.01 dev