Merge pull request #25 from RonPasquarelli/master

Changes based on OpenESPI/OpenADE call on 12/8/2014.