Dev branch update
add newfile on dev
Tagged master 1.0. Merged dev. Edited newfile. Tagged 1.1.