Revert b96b333..05c336a

This rolls back to commit b96b3337083ac48c7ac7142670eb4a722b605c51.
Adding new feature
Merge branch 'development'