Merge pull request #9 from Benczyk/master

merge & debug
observatory v1