recent changes
fixed conflicts
Merge pull request #31 from snickers2029/develop

Recent updates