Commit to master

Happns before branch 2 is done
Merge pull request #2 from EF0rs/third-branch

Commit to master