Modify Neo table and remove Observation table
Merge remote-tracking branch 'upstream/master'
Merge pull request #28 from achronop/master

Merge remote-tracking branch 'upstream/master'