inamiy Merge pull request #23 from inamiy/FunOptics