initial from jerry@jerry.home ip: 192.168.1.151
merge