0.6.1

-list_all for content
-fixed options merge