Tagged master 1.0. Merged dev. Edited newfile. Tagged 1.1.
Update newfile in dev