Code cleanup
Merge branch 'develop' of github.com:acumartini/atom_location_prediction into develop
Code cleanup