introduced advanced mode, fixes #5 and #6