merge changes by seahawk1986
Merge branch 'master' into debian