first try
merge
Merge pull request #49 from hlee/master

first try

resolved merge