[BUGFIX] Fixed postfix incrementing issue that was incorrectly indexing an array
[TASK] Cleaned up code

[BUGFIX] Revert
Merge pull request #10 from b1nd/master

Fixed incremental issue with modal viewer