0.37 20140702

-header fixes
-removed useless options