Added ToJSON and FromJSON instances
Merge pull request #6 from jcristovao/master

Added ToJSON and FromJSON instances