merge develop to master

Now, develop contains only dev-0.1.