Fixed some bugs submitted automatically to Analytics
Fixed issue #4 and some other bugs