New features added

Please merge my fork. Thanks!