REMOVED_FROM_STAGE completely solved
Some minor code fixes and improvements
Updated README.md