Manual merge of Pull Request 466
Delete incorrectly added hashtag
Indented
Merge branch 'development'