Merge pull request #62 from da2ce7/master

Fix bugs introduced in last pull request.
add <typeinfo> to OTStorage.cpp