mgj : initial commit
mgj : merge with github repo