Merge pull request #1 from elelpublic/master

pull
Merge pull request #2 from elelpublic/master

pull
Merge pull request #3 from elelpublic/master

pull
Merge pull request #4 from elelpublic/master

pull
clean up captions
Merge pull request #5 from elelpublic/master

pull
Merge pull request #14 from xlvii-sven/master

clean up captions