Ironed out issues with state management and other enhancements
Merge remote-tracking branch 'origin/master'