Merge pull request #26 from SuperstarDonkeyJockey/ugc

refactoring wait for form to load
code reorg & namespace change