Working on the master during #24.
New file for the master.
Merge branch 'master' into dev_#24