Merge pull request #184 from ayr0/develop

Develop branch updates
update code and figures and changed problem at the end