Merge pull request #59 from 30x/master

Add offline mode, fix bugs