Merge pull request #1 from omerwe/master

Another LEAP Reorganization