Merge pull request #49 from davidgenetic/master

Required Fields improved
cleanup after merge
cleanup after merge
cleanup after merge