Merge branch 'hotfix/1.4.1.2_3.1'
Merge pull request #72 from Firesphere/Development

Removed unneeded feature.
Underscores. Again.
Merge branch 'hotfix/1.4.1.3_3.1' into Development