Merge master into develop
Updating deprecated binary_to_atom and atom_to_binary calls
Merge pull request #33 from jwarwick/develop

Updating deprecated binary_to_atom and atom_to_binary calls
Merge develop