initial push
Merge pull request #1 from nguyenj/master

updated